SaaS/运营平台添加人员校验

server/src/main/java/com/pica/cloud/account/account/server/service/impl/HospitalSaasUserServiceImpl.java

@@ -123,8 +123,18 @@ public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
                 return 1;
             }
             Account byMobilePhone = accountMapper.getByMobilePhone(mobileEncrypt);
+            Integer hospitalId = byMobilePhone.getHospitalId();
+            Hospital hospital;
+            if (null == hospitalId || null == (hospital = hospitalMapper.selectByPrimaryKey(hospitalId))){
+                throw new PicaException(PicaResultCode.PARAM_IS_INVALID.code(), "该手机号已存在，但未加入机构，请至云鹊医App中加入机构");
+            }
+            if (hospitalId.equals(req.getHospitalId())){
+                throw new PicaException(PicaResultCode.PARAM_IS_INVALID.code(), "该手机号已存在本机构中");
+            }
             if (!req.getHospitalId().equals(byMobilePhone.getHospitalId())) {
-                throw new PicaException(PicaResultCode.PARAM_IS_INVALID.code(), "正在添加的用户非本机构下用户");
+                throw new PicaException(
+                        PicaResultCode.PARAM_IS_INVALID.code(),
+                        String.format("该手机号已存在于\"%s\"中，如需修改请至云鹊医App中修改所属机构",hospital.getName()));
             }
             Account account = new Account();
             account.setId(byMobilePhone.getId());

server/src/main/resources/mybatis/HospitalMapper.xml

@@ -46,7 +46,7 @@
     select 
     <include refid="Base_Column_List" />
     from p_hospital
-    where id = #{id,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER} and delete_flag = 1
   </select>
   <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer" >
     delete from p_hospital