java/zhihuishenqu.git

			@@ -325,6 +325,7 @@
			loginUserInfoVO.setIsmemberrole(2);
			loginUserInfoVO.setIsFourMember(2);
			loginUserInfoVO.setIsCommunityWorker(2);
			loginUserInfoVO.setIsPropertyWorker(2);
			// 志愿者状态
			String phone = sysUserDO.getPhone();
			Long userCommunityId = sysUserDO.getCommunityId();
			@@ -346,6 +347,11 @@
			Integer countFourMember=comActFourMemberDao.selectCount(new QueryWrapper<ComActFourMember>().lambda().eq(ComActFourMember::getIdCard,sysUserDO.getIdCard()));
			if(countFourMember>0){
			loginUserInfoVO.setIsFourMember(1);
			}
			//是否是社区物业人员
			int countPropertyWorker = userDao.countPropertyWorker(Long.parseLong(userId), userCommunityId);
			if (countPropertyWorker > 0) {
			loginUserInfoVO.setIsPropertyWorker(1);
			}
			// 是否是"管理员"或者本社区 "社区团队"、"党委成员"
			Integer countTeam = userDao.selectCountTeam(phone, userCommunityId);
			@@ -584,6 +590,7 @@
			if (ObjectUtils.isEmpty(sysUserDO)) {
			return R.fail("人员不存在");
			}

			BeanUtils.copyProperties(sysUserDO, loginUserInfoVO);
			List<ComMngFamilyInfoDO> comMngFamilyInfoDOS = comMngFamilyInfoDAO
			.selectList(new QueryWrapper<ComMngFamilyInfoDO>().lambda().eq(ComMngFamilyInfoDO::getUserId, userId));
			@@ -637,6 +644,9 @@
			if (!ObjectUtils.isEmpty(comActVO)) {
			loginUserInfoVO.setCommunityName(comActVO.getName());
			}
			//是否是社区物业人员
			int countPropertyWorker = userDao.countPropertyWorker(userId, loginUserInfoVO.getCommunityId());
			loginUserInfoVO.setIsPropertyWorker(countPropertyWorker > 0 ? 1 : 0);
			loginUserInfoVO.setIdCard(SensitiveUtil.desensitizedIdNumber(loginUserInfoVO.getIdCard()));
			loginUserInfoVO.setPhone(SensitiveUtil.desensitizedPhoneNumber(loginUserInfoVO.getPhone()));
			return R.ok(loginUserInfoVO);
			@@ -2063,7 +2073,7 @@
			@Override
			public R editSysUser(ShopStoreVO storeVO) {
			SysUserDO sysUserDO1 = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda()
			.eq(SysUserDO::getPhone, storeVO.getPhone()).eq(SysUserDO::getType, 5));
			.eq(SysUserDO::getPhone, storeVO.getStoreAccount()).eq(SysUserDO::getType, 5));
			if (sysUserDO1 == null) {
			return R.fail("未查询到后台管理用户！");
			}
			@@ -2589,10 +2599,6 @@
			if (nonNull(sysUserDO)) {
			return R.fail("账户已经存在");
			}
			sysUserDO = userDao.selectOne(new QueryWrapper<SysUserDO>().lambda().eq(SysUserDO::getPhone, convenientMerchantDTO.getPhone()));
			if (nonNull(sysUserDO)) {
			return R.fail("手机号已经存在");
			}
			// sys_user 表
			sysUserDO = new SysUserDO();
			String encode = new BCryptPasswordEncoder().encode(convenientMerchantDTO.getPassword());
			@@ -2601,7 +2607,7 @@
			sysUserDO.setType(10);
			sysUserDO.setAreaId(null);
			sysUserDO.setStatus(1);
			sysUserDO.setPhone(convenientMerchantDTO.getPhone());
			sysUserDO.setPhone(null);
			sysUserDO.setName(convenientMerchantDTO.getContacts());
			sysUserDO.setPassword(encode);
			try {