健康小屋- 逻辑修改

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/controller/user/UserController.java

@@ -189,7 +189,7 @@ public class UserController  extends EnvelopRestEndpoint {
        if (b) {
            return success("该管理员账号存在！",b);
        }else {
            return success("该管理员账号不存在！",b);
            return failed("该管理员账号不存在！");
        }
    }
@@ -202,7 +202,7 @@ public class UserController  extends EnvelopRestEndpoint {
        if (user != null) {
            return success("该管理员账号存在！",user);
        }else {
            return success("该管理员账号不存在！",user);
            return failed("该管理员账号不存在！");
        }
    }

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/dao/user/UserDao.java

@@ -18,9 +18,11 @@ public interface UserDao extends PagingAndSortingRepository<User, String>, JpaSp
    User findByIdAndActivated(String id,String activated);
    User findById(String id);
    @Query("from User u where u.loginCode=?1 and u.activated<>0 ")
    User findByLoginCodeAndActivated(String loginCode,String activated);
    User findByLoginCode(String loginCode);
    @Query("from User u where u.name=?1 and u.activated=?2 ")
    User findByNameAAndActivated(String name,String activated);

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/model/user/User.java

@@ -59,7 +59,7 @@ public class User extends UuidIdentityEntityWithOperator {
    @Column(name = "salt")
    private String salt; //加密种子
    @Column(name = "facility_used_count")
    @Column(name = "facility_used_count",columnDefinition="int default 1")
    private Integer facilityUsedCount;//设施使用次数
    @Column(name = "realname_authentication")

svr/svr-healthy-house/src/main/java/com/yihu/jw/healthyhouse/service/user/UserService.java

@@ -193,6 +193,7 @@ public class UserService extends BaseJpaService<User, UserDao> {
            user.setCreateUser(userCode);
            user.setCreateTime(new Date());
            user.setActivated(1);
            user.setFacilityUsedCount(0);
            userDao.save(user);
            return Envelop.getSuccess("保存成功");
        } else {//修改