Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/NTTravel

Pu Zhibing

2024-12-13 73b750200f25df08aa64124da49e7461f9de6653

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

@@ -299,7 +299,7 @@
    @ResponseBody
    public Object add(TCompany tCompany,@RequestParam String subArr,String account,String password) {
        //判断账号是否已存在
        int count = userService.selectCount(new EntityWrapper<User>().eq("account", account));
        int count = userService.selectCount(new EntityWrapper<User>().eq("account", account).ne("status",3));
        if (count > 0){
            return "error";
        }
@@ -359,7 +359,7 @@
    @ResponseBody
    public Object addFranchisee(TCompany tCompany,String account,String password) {
        //判断账号是否已存在
        int count = userService.selectCount(new EntityWrapper<User>().eq("account", account));
        int count = userService.selectCount(new EntityWrapper<User>().eq("account", account).ne("status",3));
        if (count > 0){
            return "error";
        }
@@ -412,7 +412,7 @@
        if (SinataUtil.isNotEmpty(account) && SinataUtil.isNotEmpty(password)){
            if (!user.getAccount().equals(account)){
                //判断账号是否已存在
                int count = userService.selectCount(new EntityWrapper<User>().eq("account", account));
                int count = userService.selectCount(new EntityWrapper<User>().eq("account", account).ne("flag",3));
                if (count > 0){
                    return "error";
                }
@@ -456,7 +456,7 @@
        User user = userService.selectById(userId);
        if (!user.getAccount().equals(account)){
            //判断账号是否已存在
            int count = userService.selectCount(new EntityWrapper<User>().eq("account", account));
            int count = userService.selectCount(new EntityWrapper<User>().eq("account", account).ne("status",3));
            if (count > 0){
                return "error";
            }