修改bug

Pu Zhibing

2025-07-04 c8638df756d5c56f2d0c3ed35522fc5a340122c8

修改bug

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java

@@ -30,10 +30,7 @@
import org.springframework.web.bind.annotation.ResponseBody;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.*;

/**
 * 分公司管理控制器
@@ -357,7 +354,11 @@
            CreateEnterprise enterprise = EnterpriseUtil.createEnterprise(request);
            enterCode = enterprise.getIdCode();
            List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(principalPhone, enterCode);
            empId = userInfoByPhone.get(0).getEmpId();
            if(null != userInfoByPhone && userInfoByPhone.size() > 0){
                empId = userInfoByPhone.get(0).getEmpId();
            }else{
                empId = 0L;
            }
        }
        //企业已注册
        if (null != checkEnterExist && "1".equals(checkEnterExist.getIsReg())) {
@@ -419,6 +420,22 @@
        user.setEntercode(enterCode);
        user.setEnterId(Long.valueOf(enterCode));
        userService.insert(user);
        //编写异步延迟处理中台账号延迟创建的问题
        if(0 == empId){
            Timer timer = new Timer();
            String finalEnterCode = enterCode;
            timer.schedule(new TimerTask() {
                @Override
                public void run() {
                    List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(principalPhone, finalEnterCode);
                    if(null != userInfoByPhone && userInfoByPhone.size() > 0){
                        Long empId1 = userInfoByPhone.get(0).getEmpId();
                        user.setEmpId(empId1);
                        userService.updateById(user);
                    }
                }
            },120*1000);
        }
    
        //添加经营区域
        addSocpe(subArr, tCompany.getId());
@@ -487,7 +504,11 @@
            CreateEnterprise enterprise = EnterpriseUtil.createEnterprise(request);
            enterCode = enterprise.getIdCode();
            List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(principalPhone, enterCode);
            empId = userInfoByPhone.get(0).getEmpId();
            if(null != userInfoByPhone && userInfoByPhone.size() > 0){
                empId = userInfoByPhone.get(0).getEmpId();
            }else{
                empId = 0L;
            }
        }
        //企业已注册
        if (null != checkEnterExist && "1".equals(checkEnterExist.getIsReg())) {
@@ -547,7 +568,22 @@
        user.setEntercode(enterCode);
        user.setEnterId(Long.valueOf(enterCode));
        userService.insert(user);
	
        //编写异步延迟处理中台账号延迟创建的问题
        if(0 == empId){
            Timer timer = new Timer();
            String finalEnterCode = enterCode;
            timer.schedule(new TimerTask() {
                @Override
                public void run() {
                    List<QYTUserInfo> userInfoByPhone = UserUtil.getUserInfoByPhone(principalPhone, finalEnterCode);
                    if(null != userInfoByPhone && userInfoByPhone.size() > 0){
                        Long empId1 = userInfoByPhone.get(0).getEmpId();
                        user.setEmpId(empId1);
                        userService.updateById(user);
                    }
                }
            },120*1000);
        }
        return SUCCESS_TIP;
    }


 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/EmployeeUtil.java

@@ -24,21 +24,29 @@
    
    
    public static void main(String[] args) {
        SaveStaffNodeRequest request = new SaveStaffNodeRequest();
        request.setMobile("18798410042");
        request.setEntercode("9811000039358999");
        request.setEmpName("莫萍");
        request.setEmpNickname("莫萍");
        request.setLoginNo("15180824124");
        request.setEmpSex("女");
        request.setMphone("15180824124");
        request.setEmail("15180824124" + "@qyt.com");
        request.setDeptId(0);
        request.setPositionId(1);
        request.setSuperLevel(0);
        request.setHideMobile(0);
        SaveStaffNode saveStaffNode = EmployeeUtil.saveStaffNode(request);
        System.out.println(saveStaffNode);
//        SaveStaffNodeRequest request = new SaveStaffNodeRequest();
//        request.setMobile("18798410042");
//        request.setEntercode("9811000039358999");
//        request.setEmpName("莫萍");
//        request.setEmpNickname("莫萍");
//        request.setLoginNo("15180824124");
//        request.setEmpSex("女");
//        request.setMphone("15180824124");
//        request.setEmail("15180824124" + "@qyt.com");
//        request.setDeptId(0);
//        request.setPositionId(1);
//        request.setSuperLevel(0);
//        request.setHideMobile(0);
//        SaveStaffNode saveStaffNode = EmployeeUtil.saveStaffNode(request);
//        System.out.println(saveStaffNode);
		
		
		
        DeleteStafNodeRequest deleteStafNodeRequest = new DeleteStafNodeRequest();
        deleteStafNodeRequest.setEmpId(11451968L);
        deleteStafNodeRequest.setEntercode("981100006318563");
        deleteStafNodeRequest.setMobile("13688394165");
        EmployeeUtil.ecrmDeleteStafNode(deleteStafNodeRequest);
    }
    
    

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/EnterpriseUtil.java

@@ -309,7 +309,10 @@
//        System.out.println(enterprise);
//
        
        CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterNameExist("黔南云码通数字产业运营有限公司");
        System.out.println(checkEnterExist);
//        CheckEnterExist checkEnterExist = EnterpriseUtil.checkEnterNameExist("黔南云码通数字产业运营有限公司");
//        System.out.println(checkEnterExist);
		
		
        EnterpriseUtil.delEnterprise("981100006318563", "13688394165");
    }
}

 ManagementQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/qianyuntong/UserUtil.java

@@ -220,7 +220,7 @@

    
    public static void main(String[] args) {
        List<QYTUserInfo> userInfoByPhone = getUserInfoByPhone("18685061710", "981100006032200");
        List<QYTUserInfo> userInfoByPhone = getUserInfoByPhone("13688394165", "981100006318563");
        System.out.println(userInfoByPhone);
    }
}

 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/franchisee.html

@@ -46,9 +46,6 @@
                            @if(shiro.hasPermission("/tCompany/updateFranchisee")){
                            <#button name="修改" icon="fa-edit" clickFun="Franchisee.updateFranchisee()" space="true"/>
                            @}
                            @if(shiro.hasPermission("/tCompany/deleteFranchisee")){
                            <#button name="删除" icon="fa-remove" clickFun="Franchisee.deleteFranchisee()" space="true"/>
                            @}
                            @if(shiro.hasPermission("/tCompany/detailFranchisee")){
                            <#button name="查看详情" icon="fa-remove" clickFun="Franchisee.detailFranchisee()" space="true"/>
                            @}

 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tCompany/tCompany.html

@@ -49,9 +49,6 @@
                            @if(shiro.hasPermission("/tCompany/update")){
                                <#button name="修改" icon="fa-edit" clickFun="TCompany.openTCompanyDetail()" space="true"/>
                            @}
                            @if(shiro.hasPermission("/tCompany/delete")){
                                <#button name="删除" icon="fa-remove" clickFun="TCompany.delete()" space="true"/>
                            @}
                            @if(shiro.hasPermission("/tCompany/detail")){
                                <#button name="查看详情" icon="fa-search" clickFun="TCompany.detail()" space="true"/>
                            @}

 ManagementQYTTravel/guns-admin/src/main/webapp/WEB-INF/view/system/user/user_add.html

@@ -13,7 +13,6 @@
                        <option value="1">男</option>
                        <option value="2">女</option>
                    </#select>
                    <input placeholder="">
                    <#input id="password" name="密码" underline="true" type="password" placeholder="密码必须包含大小写字母，数字，符号"/>
                    <#input id="rePassword" name="确认密码" type="password" placeholder="密码必须包含大小写字母，数字，符号"/>


 MessagePushTravel/src/main/java/com/sinata/push/util/echo/NettyServerController.java

@@ -228,7 +228,7 @@
                                System.err.println("调用driver-server存储位置数据出错了");
                            }
                        }
                        redisTemplate.opsForValue().set("DRIVER" + driverId, lon + "," + lat, 300, TimeUnit.SECONDS);//实时位置存入redis中
                        redisTemplate.opsForValue().set("DRIVER" + driverId, lon + "," + lat, 30, TimeUnit.SECONDS);//实时位置存入redis中
                    }else{
                        this.sendMsgToClient(ctx, "__error__" + msg.toString());
                    }