Merge branch 'dev_v1.3.6_20221011' into online

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/SubjectServiceImpl.java

@@ -80,6 +80,12 @@ public class SubjectServiceImpl extends BaseServiceImpl<Long, Subject> implement
         if (subjectByName != null && subjectByName.getId() != subject.getId()) {
             throw new BizException("名称已存在，请修改名称");
         }
+        if (subject.getParentSubjectId() != null && subject.getParentSubjectId() >0) {
+            Subject parentSubject = subjectDao.get(subject.getParentSubjectId());
+            if (parentSubject == null) {
+                throw new BizException("上级声部不存在");
+            }
+        }
 
         if (subject.getId() != null) {
             subject.setUpdateTime(new Date());