Merge branch 'dev-1.0.6' into dev-1.0.5

src/main/java/cn/hnthyy/thmz/mapper/his/EmployeeMapper.java

@@ -24,9 +24,9 @@ public interface EmployeeMapper {
      * @return
      */
     @Select({"<script>",
-            "select rtrim(code) employee_code,rtrim(name) employee_name,del_flag,rtrim(mark) mark,rtrim(dept_code) dept_code from a_employee_mi ",
+            "select rtrim(code) employee_code,rtrim(name) employee_name,del_flag,rtrim(mark) mark,rtrim(dept_code) dept_code from a_employee_mi where (del_flag is null or del_flag =0 ) ",
             "<when test='depts!=null'>",
-            " where dept_code in",
+            " and  dept_code in",
             "<foreach item='item' index='index' collection='depts' open='(' separator=',' close=')'>",
             "#{item}",
             "</foreach>",
@@ -42,9 +42,9 @@ public interface EmployeeMapper {
      * @return
      */
     @Select({"<script>",
-            "select rtrim(code) employee_code,rtrim(name) employee_name,del_flag,rtrim(mark) mark from a_employee_mi",
+            "select rtrim(code) employee_code,rtrim(name) employee_name,del_flag,rtrim(mark) mark from a_employee_mi where (del_flag is null or del_flag =0 )",
             "<when test='dept!=null'>",
-            " where dept_code =#{dept}",
+            " and dept_code =#{dept}",
             "</when>",
             "</script>"})
     List<Employee> selectEmployeeByDept(@Param("dept") String dept);
@@ -56,7 +56,7 @@ public interface EmployeeMapper {
      * @param name
      * @return
      */
-    @Select(" select top 1 rtrim(code) employeeCode,rtrim(name) employeeName,del_flag,rtrim(mark) mark from a_employee_mi  where  name =#{name}")
+    @Select(" select top 1 rtrim(code) employeeCode,rtrim(name) employeeName,del_flag,rtrim(mark) mark from a_employee_mi  where name =#{name} and (del_flag is null or del_flag =0 )")
     Employee selectByUserName(@Param("name") String name);
 
 
@@ -66,7 +66,7 @@ public interface EmployeeMapper {
      * @param code
      * @return
      */
-    @Select(" select top 1 rtrim(code) employeeCode,rtrim(name) employeeName,del_flag,rtrim(mark) mark from a_employee_mi  where  code =#{code}")
+    @Select(" select top 1 rtrim(code) employeeCode,rtrim(name) employeeName,del_flag,rtrim(mark) mark from a_employee_mi  where  code =#{code} and (del_flag is null or del_flag =0 )")
     Employee selectByUserCode(@Param("code") String code);
 
 
@@ -88,6 +88,6 @@ public interface EmployeeMapper {
      * 查询所有医生
      * @return
      */
-    @Select("select rtrim(code) employeeCode,rtrim(name) employeeName,del_flag,rtrim(mark) mark from a_employee_mi ")
+    @Select("select rtrim(code) employeeCode,rtrim(name) employeeName,del_flag,rtrim(mark) mark from a_employee_mi where (del_flag is null or del_flag =0 ) ")
     List<Employee> selectAll();
 }